Change in openvpn[master]: win: allow OpenVPN service account to use any command-line options
A message that is not in the archive (sent off-list or not yet received): gerrit.1741780483000.I44d308301dfb7c22600d8632a553288f52b3068f@...2715...
Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/906?usp=email
to review the following change.
Change subject: win: allow OpenVPN service account to use any command-line options
......................................................................
win: allow OpenVPN service account to use any command-line options
Since 2.7, OpenVPN service (used to start persistent connections) runs under limited virtual service account NT SERVICE\OpenVPNService.
Since it should be able to use all command-line options and cannot be made member of "OpenVPN Administrators" group, it has to be handled separately.
---
M src/openvpnserv/common.c
M src/openvpnserv/interactive.c
M src/openvpnserv/service.h
M src/openvpnserv/validate.c
M src/openvpnserv/validate.h
5 files changed, 26 insertions(+), 9 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/06/906/1
src/openvpnserv/common.c +8 -0
@@ -130,6 +130,14 @@ { goto out; } + + error =GetRegString (key,TEXT ("ovpn_service_user" ), s->ovpn_service_user, +sizeof (s->ovpn_service_user),OVPN_SERVICE_USER ); +if (error !=ERROR_SUCCESS ) + { + goto out; + } +/* set process priority */ if (!_wcsicmp (priority,TEXT ("IDLE_PRIORITY_CLASS" ))) {
src/openvpnserv/interactive.c +1 -1
@@ -2497,7 +2497,7 @@* OR user is authorized to run any config. */ if (!ValidateOptions (pipe, sud.directory, sud.options, errmsg,_countof (errmsg)) - && !IsAuthorizedUser (ovpn_user->User.Sid, imp_token, settings.ovpn_admin_group)) + && !IsAuthorizedUser (ovpn_user->User.Sid, imp_token, settings.ovpn_admin_group, settings.ovpn_service_user)) {ReturnError (pipe,ERROR_STARTUP_DATA , errmsg,1 , &exit_event); goto out;
src/openvpnserv/service.h +1 -0
@@ -71,6 +71,7 @@TCHAR ext_string[16 ];TCHAR log_dir[MAX_PATH ];TCHAR ovpn_admin_group[MAX_NAME ]; +TCHAR ovpn_service_user[MAX_NAME ];DWORD priority;BOOL append; } settings_t;
src/openvpnserv/validate.c +7 -5
@@ -140,12 +140,8 @@return b; } -/* -* Check whether user is a member of Administrators group or -* the group specified in ovpn_admin_group -*/ BOOL -IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group) +IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group,const WCHAR *ovpn_service_user) {const WCHAR *admin_group[2 ];WCHAR username[MAX_NAME ];
@@ -164,6 +160,12 @@ domain[0 ] ='\0' ; } +/* is this service account? */ +if ((wcscmp (username, ovpn_service_user) ==0 ) && (wcscmp (domain,TEXT ("NT SERVICE" )) ==0 )) + { +return TRUE; + } +if (GetBuiltinAdminGroupName (sysadmin_group,_countof (sysadmin_group))) { admin_group[0 ] = sysadmin_group;
src/openvpnserv/validate.h +9 -3
@@ -29,11 +29,17 @@/* Authorized groups who can use any options and config locations */ #define SYSTEM_ADMIN_GROUP TEXT("Administrators") -#define OVPN_ADMIN_GROUP TEXT("OpenVPN Administrators") -/* The last one may be reset in registry: HKLM\Software\OpenVPN\ovpn_admin_group */ +#define OVPN_ADMIN_GROUP TEXT("OpenVPN Administrators")/* may be set in HKLM\Software\OpenVPN\ovpn_admin_group */ +#define OVPN_SERVICE_USER TEXT("OpenVPNService")/* may be set in HKLM\Software\OpenVPN\ovpn_service_user */ + +/* +* Check whether user is a member of Administrators group or +* the group specified in ovpn_admin_group or +* OpenVPN Virtual Service Account user +*/ BOOL -IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group); +IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group,const WCHAR *ovpn_service_user);BOOL CheckOption (const WCHAR *workdir,int narg,WCHAR *argv[],const settings_t *s);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/906?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I44d308301dfb7c22600d8632a553288f52b3068f
Gerrit-Change-Number: 906
Gerrit-PatchSet: 1
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/906?usp=email
to look at the new patch set (#2).
Change subject: win: allow OpenVPN service account to use any command-line options
......................................................................
win: allow OpenVPN service account to use any command-line options
Since 2.7, OpenVPN service (used to start persistent connections) runs under limited virtual service account NT SERVICE\OpenVPNService.
Since it should be able to use all command-line options and cannot be made member of "OpenVPN Administrators" group, it has to be handled separately.
---
M src/openvpnserv/common.c
M src/openvpnserv/interactive.c
M src/openvpnserv/service.h
M src/openvpnserv/validate.c
M src/openvpnserv/validate.h
5 files changed, 25 insertions(+), 9 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/06/906/2
src/openvpnserv/common.c +8 -0
@@ -130,6 +130,14 @@ { goto out; } + + error =GetRegString (key,TEXT ("ovpn_service_user" ), s->ovpn_service_user, +sizeof (s->ovpn_service_user),OVPN_SERVICE_USER ); +if (error !=ERROR_SUCCESS ) + { + goto out; + } +/* set process priority */ if (!_wcsicmp (priority,L"IDLE_PRIORITY_CLASS" )) {
src/openvpnserv/interactive.c +1 -1
@@ -2491,7 +2491,7 @@* OR user is authorized to run any config. */ if (!ValidateOptions (pipe, sud.directory, sud.options, errmsg,_countof (errmsg)) - && !IsAuthorizedUser (ovpn_user->User.Sid, imp_token, settings.ovpn_admin_group)) + && !IsAuthorizedUser (ovpn_user->User.Sid, imp_token, settings.ovpn_admin_group, settings.ovpn_service_user)) {ReturnError (pipe,ERROR_STARTUP_DATA , errmsg,1 , &exit_event); goto out;
src/openvpnserv/service.h +1 -0
@@ -66,6 +66,7 @@WCHAR ext_string[16 ];WCHAR log_dir[MAX_PATH ];WCHAR ovpn_admin_group[MAX_NAME ]; +WCHAR ovpn_service_user[MAX_NAME ];DWORD priority;BOOL append; } settings_t;
src/openvpnserv/validate.c +7 -5
@@ -140,12 +140,8 @@return b; } -/* -* Check whether user is a member of Administrators group or -* the group specified in ovpn_admin_group -*/ BOOL -IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group) +IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group,const WCHAR *ovpn_service_user) {const WCHAR *admin_group[2 ];WCHAR username[MAX_NAME ];
@@ -164,6 +160,12 @@ domain[0 ] ='\0' ; } +/* is this service account? */ +if ((wcscmp (username, ovpn_service_user) ==0 ) && (wcscmp (domain,TEXT ("NT SERVICE" )) ==0 )) + { +return TRUE; + } +if (GetBuiltinAdminGroupName (sysadmin_group,_countof (sysadmin_group))) { admin_group[0 ] = sysadmin_group;
src/openvpnserv/validate.h +8 -3
@@ -29,11 +29,16 @@/* Authorized groups who can use any options and config locations */ #define SYSTEM_ADMIN_GROUP L"Administrators" -#define OVPN_ADMIN_GROUP L"OpenVPN Administrators" -/* The last one may be reset in registry: HKLM\Software\OpenVPN\ovpn_admin_group */ +#define OVPN_ADMIN_GROUP L"OpenVPN Administrators"/* may be set in HKLM\Software\OpenVPN\ovpn_admin_group */ +#define OVPN_SERVICE_USER L"OpenVPNService"/* may be set in HKLM\Software\OpenVPN\ovpn_service_user */ +/* +* Check whether user is a member of Administrators group or +* the group specified in ovpn_admin_group or +* OpenVPN Virtual Service Account user +*/ BOOL -IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group); +IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group,const WCHAR *ovpn_service_user);BOOL CheckOption (const WCHAR *workdir,int narg,WCHAR *argv[],const settings_t *s);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/906?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I44d308301dfb7c22600d8632a553288f52b3068f
Gerrit-Change-Number: 906
Gerrit-PatchSet: 2
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/906?usp=email
to look at the new patch set (#3).
Change subject: win: allow OpenVPN service account to use any command-line options
......................................................................
win: allow OpenVPN service account to use any command-line options
Since 2.7, OpenVPN service (used to start persistent connections) runs under limited virtual service account NT SERVICE\OpenVPNService.
Since it should be able to use all command-line options and cannot be made member of "OpenVPN Administrators" group, it has to be handled separately.
---
M src/openvpnserv/common.c
M src/openvpnserv/interactive.c
M src/openvpnserv/service.h
M src/openvpnserv/validate.c
M src/openvpnserv/validate.h
5 files changed, 25 insertions(+), 9 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/06/906/3
src/openvpnserv/common.c +8 -0
@@ -130,6 +130,14 @@ { goto out; } + + error =GetRegString (key,L"ovpn_service_user" , s->ovpn_service_user, +sizeof (s->ovpn_service_user),OVPN_SERVICE_USER ); +if (error !=ERROR_SUCCESS ) + { + goto out; + } +/* set process priority */ if (!_wcsicmp (priority,L"IDLE_PRIORITY_CLASS" )) {
src/openvpnserv/interactive.c +1 -1
@@ -2491,7 +2491,7 @@* OR user is authorized to run any config. */ if (!ValidateOptions (pipe, sud.directory, sud.options, errmsg,_countof (errmsg)) - && !IsAuthorizedUser (ovpn_user->User.Sid, imp_token, settings.ovpn_admin_group)) + && !IsAuthorizedUser (ovpn_user->User.Sid, imp_token, settings.ovpn_admin_group, settings.ovpn_service_user)) {ReturnError (pipe,ERROR_STARTUP_DATA , errmsg,1 , &exit_event); goto out;
src/openvpnserv/service.h +1 -0
@@ -66,6 +66,7 @@WCHAR ext_string[16 ];WCHAR log_dir[MAX_PATH ];WCHAR ovpn_admin_group[MAX_NAME ]; +WCHAR ovpn_service_user[MAX_NAME ];DWORD priority;BOOL append; } settings_t;
src/openvpnserv/validate.c +7 -5
@@ -140,12 +140,8 @@return b; } -/* -* Check whether user is a member of Administrators group or -* the group specified in ovpn_admin_group -*/ BOOL -IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group) +IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group,const WCHAR *ovpn_service_user) {const WCHAR *admin_group[2 ];WCHAR username[MAX_NAME ];
@@ -164,6 +160,12 @@ domain[0 ] ='\0' ; } +/* is this service account? */ +if ((wcscmp (username, ovpn_service_user) ==0 ) && (wcscmp (domain,TEXT ("NT SERVICE" )) ==0 )) + { +return TRUE; + } +if (GetBuiltinAdminGroupName (sysadmin_group,_countof (sysadmin_group))) { admin_group[0 ] = sysadmin_group;
src/openvpnserv/validate.h +8 -3
@@ -29,11 +29,16 @@/* Authorized groups who can use any options and config locations */ #define SYSTEM_ADMIN_GROUP L"Administrators" -#define OVPN_ADMIN_GROUP L"OpenVPN Administrators" -/* The last one may be reset in registry: HKLM\Software\OpenVPN\ovpn_admin_group */ +#define OVPN_ADMIN_GROUP L"OpenVPN Administrators"/* may be set in HKLM\Software\OpenVPN\ovpn_admin_group */ +#define OVPN_SERVICE_USER L"OpenVPNService"/* may be set in HKLM\Software\OpenVPN\ovpn_service_user */ +/* +* Check whether user is a member of Administrators group or +* the group specified in ovpn_admin_group or +* OpenVPN Virtual Service Account user +*/ BOOL -IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group); +IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group,const WCHAR *ovpn_service_user);BOOL CheckOption (const WCHAR *workdir,int narg,WCHAR *argv[],const settings_t *s);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/906?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I44d308301dfb7c22600d8632a553288f52b3068f
Gerrit-Change-Number: 906
Gerrit-PatchSet: 3
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/906?usp=email
to look at the new patch set (#4).
Change subject: win: allow OpenVPN service account to use any command-line options
......................................................................
win: allow OpenVPN service account to use any command-line options
Since 2.7, OpenVPN service (used to start persistent connections) runs under limited virtual service account NT SERVICE\OpenVPNService.
Since it should be able to use all command-line options and cannot be made member of "OpenVPN Administrators" group, it has to be handled separately.
---
M src/openvpnserv/common.c
M src/openvpnserv/interactive.c
M src/openvpnserv/service.h
M src/openvpnserv/validate.c
M src/openvpnserv/validate.h
5 files changed, 25 insertions(+), 9 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/06/906/4
src/openvpnserv/common.c +8 -0
@@ -130,6 +130,14 @@ { goto out; } + + error =GetRegString (key,L"ovpn_service_user" , s->ovpn_service_user, +sizeof (s->ovpn_service_user),OVPN_SERVICE_USER ); +if (error !=ERROR_SUCCESS ) + { + goto out; + } +/* set process priority */ if (!_wcsicmp (priority,L"IDLE_PRIORITY_CLASS" )) {
src/openvpnserv/interactive.c +1 -1
@@ -2491,7 +2491,7 @@* OR user is authorized to run any config. */ if (!ValidateOptions (pipe, sud.directory, sud.options, errmsg,_countof (errmsg)) - && !IsAuthorizedUser (ovpn_user->User.Sid, imp_token, settings.ovpn_admin_group)) + && !IsAuthorizedUser (ovpn_user->User.Sid, imp_token, settings.ovpn_admin_group, settings.ovpn_service_user)) {ReturnError (pipe,ERROR_STARTUP_DATA , errmsg,1 , &exit_event); goto out;
src/openvpnserv/service.h +1 -0
@@ -66,6 +66,7 @@WCHAR ext_string[16 ];WCHAR log_dir[MAX_PATH ];WCHAR ovpn_admin_group[MAX_NAME ]; +WCHAR ovpn_service_user[MAX_NAME ];DWORD priority;BOOL append; } settings_t;
src/openvpnserv/validate.c +7 -5
@@ -140,12 +140,8 @@return b; } -/* -* Check whether user is a member of Administrators group or -* the group specified in ovpn_admin_group -*/ BOOL -IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group) +IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group,const WCHAR *ovpn_service_user) {const WCHAR *admin_group[2 ];WCHAR username[MAX_NAME ];
@@ -164,6 +160,12 @@ domain[0 ] ='\0' ; } +/* is this service account? */ +if ((wcscmp (username, ovpn_service_user) ==0 ) && (wcscmp (domain,L"NT SERVICE" ) ==0 )) + { +return TRUE; + } +if (GetBuiltinAdminGroupName (sysadmin_group,_countof (sysadmin_group))) { admin_group[0 ] = sysadmin_group;
src/openvpnserv/validate.h +8 -3
@@ -29,11 +29,16 @@/* Authorized groups who can use any options and config locations */ #define SYSTEM_ADMIN_GROUP L"Administrators" -#define OVPN_ADMIN_GROUP L"OpenVPN Administrators" -/* The last one may be reset in registry: HKLM\Software\OpenVPN\ovpn_admin_group */ +#define OVPN_ADMIN_GROUP L"OpenVPN Administrators"/* may be set in HKLM\Software\OpenVPN\ovpn_admin_group */ +#define OVPN_SERVICE_USER L"OpenVPNService"/* may be set in HKLM\Software\OpenVPN\ovpn_service_user */ +/* +* Check whether user is a member of Administrators group or +* the group specified in ovpn_admin_group or +* OpenVPN Virtual Service Account user +*/ BOOL -IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group); +IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group,const WCHAR *ovpn_service_user);BOOL CheckOption (const WCHAR *workdir,int narg,WCHAR *argv[],const settings_t *s);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/906?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I44d308301dfb7c22600d8632a553288f52b3068f
Gerrit-Change-Number: 906
Gerrit-PatchSet: 4
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: d12fk, flichtenheld, plaisthos, selvanair, stipa.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/906?usp=email )
Change subject: win: allow OpenVPN service account to use any command-line options
......................................................................
Patch Set 4: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/906?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I44d308301dfb7c22600d8632a553288f52b3068f
Gerrit-Change-Number: 906
Gerrit-PatchSet: 4
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: selvanair <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Attention: d12fk <[email protected]...>
Gerrit-Attention: selvanair <[email protected]...>
Gerrit-Attention: stipa <[email protected]...>
Gerrit-Comment-Date: Tue, 15 Apr 2025 15:51:10 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v4 1/1 win: allow OpenVPN service account to use any command-line options
In reply to a message not in the archiveFrom: Lev Stipakov <[email protected]...>
Since 2.7, OpenVPN service (used to start persistent connections) runs under limited virtual service account NT SERVICE\OpenVPNService.
Since it should be able to use all command-line options and cannot be made member of "OpenVPN Administrators" group, it has to be handled separately.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/906
This mail reflects revision 4 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
src/openvpnserv/common.c +8 -0
@@ -130,6 +130,14 @@ { goto out; } + + error =GetRegString (key,L"ovpn_service_user" , s->ovpn_service_user, +sizeof (s->ovpn_service_user),OVPN_SERVICE_USER ); +if (error !=ERROR_SUCCESS ) + { + goto out; + } +/* set process priority */ if (!_wcsicmp (priority,L"IDLE_PRIORITY_CLASS" )) {
src/openvpnserv/interactive.c +1 -1
@@ -2491,7 +2491,7 @@* OR user is authorized to run any config. */ if (!ValidateOptions (pipe, sud.directory, sud.options, errmsg,_countof (errmsg)) - && !IsAuthorizedUser (ovpn_user->User.Sid, imp_token, settings.ovpn_admin_group)) + && !IsAuthorizedUser (ovpn_user->User.Sid, imp_token, settings.ovpn_admin_group, settings.ovpn_service_user)) {ReturnError (pipe,ERROR_STARTUP_DATA , errmsg,1 , &exit_event); goto out;
src/openvpnserv/service.h +1 -0
@@ -66,6 +66,7 @@WCHAR ext_string[16 ];WCHAR log_dir[MAX_PATH ];WCHAR ovpn_admin_group[MAX_NAME ]; +WCHAR ovpn_service_user[MAX_NAME ];DWORD priority;BOOL append; } settings_t;
src/openvpnserv/validate.c +7 -5
@@ -140,12 +140,8 @@return b; } -/* -* Check whether user is a member of Administrators group or -* the group specified in ovpn_admin_group -*/ BOOL -IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group) +IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group,const WCHAR *ovpn_service_user) {const WCHAR *admin_group[2 ];WCHAR username[MAX_NAME ];
@@ -164,6 +160,12 @@ domain[0 ] ='\0' ; } +/* is this service account? */ +if ((wcscmp (username, ovpn_service_user) ==0 ) && (wcscmp (domain,L"NT SERVICE" ) ==0 )) + { +return TRUE; + } +if (GetBuiltinAdminGroupName (sysadmin_group,_countof (sysadmin_group))) { admin_group[0 ] = sysadmin_group;
src/openvpnserv/validate.h +8 -3
@@ -29,11 +29,16 @@/* Authorized groups who can use any options and config locations */ #define SYSTEM_ADMIN_GROUP L"Administrators" -#define OVPN_ADMIN_GROUP L"OpenVPN Administrators" -/* The last one may be reset in registry: HKLM\Software\OpenVPN\ovpn_admin_group */ +#define OVPN_ADMIN_GROUP L"OpenVPN Administrators"/* may be set in HKLM\Software\OpenVPN\ovpn_admin_group */ +#define OVPN_SERVICE_USER L"OpenVPNService"/* may be set in HKLM\Software\OpenVPN\ovpn_service_user */ +/* +* Check whether user is a member of Administrators group or +* the group specified in ovpn_admin_group or +* OpenVPN Virtual Service Account user +*/ BOOL -IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group); +IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group,const WCHAR *ovpn_service_user);BOOL CheckOption (const WCHAR *workdir,int narg,WCHAR *argv[],const settings_t *s);
[Openvpn-devel] [PATCH applied] Re: win: allow OpenVPN service account to use any command-line options
This is part of a series of changes to make the "non-interactive OpenVPN service" run itself + openvpn.exec without SYSTEM privileges, using the iservice. This service needs more privileges than "joe random user", especially "run config files from non-default directories", and we can't add the service user to the "OpenVPN Administrators" group -> so add privileges for "the service user", as if part of that group (config files, and command line options).
Stared hard at the code, and tested building. Not actually tested the resulting binaries.
Your patch has been applied to the master branch.
commit 7846055717d138e6b1130cec67412acf127e9b78
Author: Lev Stipakov Date: Tue Apr 15 17:51:24 2025 +0200
win: allow OpenVPN service account to use any command-line options
Signed-off-by: Lev Stipakov <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31435.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#5) to the change originally created by stipa. ( http://gerrit.openvpn.net/c/openvpn/+/906?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: win: allow OpenVPN service account to use any command-line options
......................................................................
win: allow OpenVPN service account to use any command-line options
Since 2.7, OpenVPN service (used to start persistent connections) runs under limited virtual service account NT SERVICE\OpenVPNService.
Since it should be able to use all command-line options and cannot be made member of "OpenVPN Administrators" group, it has to be handled separately.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31435.html
---
M src/openvpnserv/common.c
M src/openvpnserv/interactive.c
M src/openvpnserv/service.h
M src/openvpnserv/validate.c
M src/openvpnserv/validate.h
5 files changed, 25 insertions(+), 9 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/06/906/5
src/openvpnserv/common.c +8 -0
@@ -130,6 +130,14 @@ { goto out; } + + error =GetRegString (key,L"ovpn_service_user" , s->ovpn_service_user, +sizeof (s->ovpn_service_user),OVPN_SERVICE_USER ); +if (error !=ERROR_SUCCESS ) + { + goto out; + } +/* set process priority */ if (!_wcsicmp (priority,L"IDLE_PRIORITY_CLASS" )) {
src/openvpnserv/interactive.c +1 -1
@@ -3410,7 +3410,7 @@* OR user is authorized to run any config. */ if (!ValidateOptions (pipe, sud.directory, sud.options, errmsg,_countof (errmsg)) - && !IsAuthorizedUser (ovpn_user->User.Sid, imp_token, settings.ovpn_admin_group)) + && !IsAuthorizedUser (ovpn_user->User.Sid, imp_token, settings.ovpn_admin_group, settings.ovpn_service_user)) {ReturnError (pipe,ERROR_STARTUP_DATA , errmsg,1 , &exit_event); goto out;
src/openvpnserv/service.h +1 -0
@@ -66,6 +66,7 @@WCHAR ext_string[16 ];WCHAR log_dir[MAX_PATH ];WCHAR ovpn_admin_group[MAX_NAME ]; +WCHAR ovpn_service_user[MAX_NAME ];DWORD priority;BOOL append; } settings_t;
src/openvpnserv/validate.c +7 -5
@@ -140,12 +140,8 @@return b; } -/* -* Check whether user is a member of Administrators group or -* the group specified in ovpn_admin_group -*/ BOOL -IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group) +IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group,const WCHAR *ovpn_service_user) {const WCHAR *admin_group[2 ];WCHAR username[MAX_NAME ];
@@ -164,6 +160,12 @@ domain[0 ] ='\0' ; } +/* is this service account? */ +if ((wcscmp (username, ovpn_service_user) ==0 ) && (wcscmp (domain,L"NT SERVICE" ) ==0 )) + { +return TRUE; + } +if (GetBuiltinAdminGroupName (sysadmin_group,_countof (sysadmin_group))) { admin_group[0 ] = sysadmin_group;
src/openvpnserv/validate.h +8 -3
@@ -29,11 +29,16 @@/* Authorized groups who can use any options and config locations */ #define SYSTEM_ADMIN_GROUP L"Administrators" -#define OVPN_ADMIN_GROUP L"OpenVPN Administrators" -/* The last one may be reset in registry: HKLM\Software\OpenVPN\ovpn_admin_group */ +#define OVPN_ADMIN_GROUP L"OpenVPN Administrators"/* may be set in HKLM\Software\OpenVPN\ovpn_admin_group */ +#define OVPN_SERVICE_USER L"OpenVPNService"/* may be set in HKLM\Software\OpenVPN\ovpn_service_user */ +/* +* Check whether user is a member of Administrators group or +* the group specified in ovpn_admin_group or +* OpenVPN Virtual Service Account user +*/ BOOL -IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group); +IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group,const WCHAR *ovpn_service_user);BOOL CheckOption (const WCHAR *workdir,int narg,WCHAR *argv[],const settings_t *s);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/906?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I44d308301dfb7c22600d8632a553288f52b3068f
Gerrit-Change-Number: 906
Gerrit-PatchSet: 5
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: selvanair <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/906?usp=email )
Change subject: win: allow OpenVPN service account to use any command-line options
......................................................................
win: allow OpenVPN service account to use any command-line options
Since 2.7, OpenVPN service (used to start persistent connections) runs under limited virtual service account NT SERVICE\OpenVPNService.
Since it should be able to use all command-line options and cannot be made member of "OpenVPN Administrators" group, it has to be handled separately.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31435.html
---
M src/openvpnserv/common.c
M src/openvpnserv/interactive.c
M src/openvpnserv/service.h
M src/openvpnserv/validate.c
M src/openvpnserv/validate.h
5 files changed, 25 insertions(+), 9 deletions(-)
src/openvpnserv/common.c +8 -0
@@ -130,6 +130,14 @@ { goto out; } + + error =GetRegString (key,L"ovpn_service_user" , s->ovpn_service_user, +sizeof (s->ovpn_service_user),OVPN_SERVICE_USER ); +if (error !=ERROR_SUCCESS ) + { + goto out; + } +/* set process priority */ if (!_wcsicmp (priority,L"IDLE_PRIORITY_CLASS" )) {
src/openvpnserv/interactive.c +1 -1
@@ -3410,7 +3410,7 @@* OR user is authorized to run any config. */ if (!ValidateOptions (pipe, sud.directory, sud.options, errmsg,_countof (errmsg)) - && !IsAuthorizedUser (ovpn_user->User.Sid, imp_token, settings.ovpn_admin_group)) + && !IsAuthorizedUser (ovpn_user->User.Sid, imp_token, settings.ovpn_admin_group, settings.ovpn_service_user)) {ReturnError (pipe,ERROR_STARTUP_DATA , errmsg,1 , &exit_event); goto out;
src/openvpnserv/service.h +1 -0
@@ -66,6 +66,7 @@WCHAR ext_string[16 ];WCHAR log_dir[MAX_PATH ];WCHAR ovpn_admin_group[MAX_NAME ]; +WCHAR ovpn_service_user[MAX_NAME ];DWORD priority;BOOL append; } settings_t;
src/openvpnserv/validate.c +7 -5
@@ -140,12 +140,8 @@return b; } -/* -* Check whether user is a member of Administrators group or -* the group specified in ovpn_admin_group -*/ BOOL -IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group) +IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group,const WCHAR *ovpn_service_user) {const WCHAR *admin_group[2 ];WCHAR username[MAX_NAME ];
@@ -164,6 +160,12 @@ domain[0 ] ='\0' ; } +/* is this service account? */ +if ((wcscmp (username, ovpn_service_user) ==0 ) && (wcscmp (domain,L"NT SERVICE" ) ==0 )) + { +return TRUE; + } +if (GetBuiltinAdminGroupName (sysadmin_group,_countof (sysadmin_group))) { admin_group[0 ] = sysadmin_group;
src/openvpnserv/validate.h +8 -3
@@ -29,11 +29,16 @@/* Authorized groups who can use any options and config locations */ #define SYSTEM_ADMIN_GROUP L"Administrators" -#define OVPN_ADMIN_GROUP L"OpenVPN Administrators" -/* The last one may be reset in registry: HKLM\Software\OpenVPN\ovpn_admin_group */ +#define OVPN_ADMIN_GROUP L"OpenVPN Administrators"/* may be set in HKLM\Software\OpenVPN\ovpn_admin_group */ +#define OVPN_SERVICE_USER L"OpenVPNService"/* may be set in HKLM\Software\OpenVPN\ovpn_service_user */ +/* +* Check whether user is a member of Administrators group or +* the group specified in ovpn_admin_group or +* OpenVPN Virtual Service Account user +*/ BOOL -IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group); +IsAuthorizedUser (PSID sid,const HANDLE token,const WCHAR *ovpn_admin_group,const WCHAR *ovpn_service_user);BOOL CheckOption (const WCHAR *workdir,int narg,WCHAR *argv[],const settings_t *s);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/906?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I44d308301dfb7c22600d8632a553288f52b3068f
Gerrit-Change-Number: 906
Gerrit-PatchSet: 5
Gerrit-Owner: stipa <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: d12fk <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-Reviewer: selvanair <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged